From d895eef63a1163447d395015ce3383747c71bf6e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Aug 2005 17:18:12 +0000 Subject: [PATCH] Use XFixesChangeSaveSet if available. (#314682) 2005-08-29 Matthias Clasen * gtk/gtksocket-x11.c (_gtk_socket_windowing_embed_notify): Use XFixesChangeSaveSet if available. (#314682) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtksocket-x11.c | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 891cdcdd41..4aef53840e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-08-29 Matthias Clasen + * gtk/gtksocket-x11.c (_gtk_socket_windowing_embed_notify): + Use XFixesChangeSaveSet if available. (#314682) + * gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu was active. (#314298, Christian Persch, analysis by Mark McLoughlin) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 891cdcdd41..4aef53840e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-08-29 Matthias Clasen + * gtk/gtksocket-x11.c (_gtk_socket_windowing_embed_notify): + Use XFixesChangeSaveSet if available. (#314682) + * gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu was active. (#314298, Christian Persch, analysis by Mark McLoughlin) diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c index 46d7f5f216..5dad07eeeb 100644 --- a/gtk/gtksocket-x11.c +++ b/gtk/gtksocket-x11.c @@ -41,6 +41,10 @@ #include "x11/gdkx.h" +#ifdef HAVE_XFIXES +#include +#endif + #include "gtkxembed.h" #include "gtkalias.h" @@ -263,6 +267,13 @@ _gtk_socket_windowing_embed_get_info (GtkSocket *socket) void _gtk_socket_windowing_embed_notify (GtkSocket *socket) { +#ifdef HAVE_XFIXES + GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket); + + XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display)), + GDK_WINDOW_XWINDOW (socket->plug_window), + SetModeInsert, SaveSetRoot, SaveSetUnmap); +#endif _gtk_xembed_send_message (socket->plug_window, XEMBED_EMBEDDED_NOTIFY, 0, GDK_WINDOW_XWINDOW (GTK_WIDGET (socket)->window), -- 2.30.2